(while-no-input): Don't splice BODY directly into the `or' form.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c8fc4b869ca9939d97dc7905dd2004b560e24a4d..7a3ed818b3ec07043f349416b8832eb50d0e2c91 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-08  Johan Bockg\e$(Q)[\e(Brd  <bojohan@gnu.org>
+
+       * subr.el (while-no-input): Don't splice BODY directly into the
+       `or' form.
+
 2008-03-08  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * diff-mode.el (diff-ignore-whitespace-hunk): Bind

diff --git a/lisp/subr.el b/lisp/subr.el
index 79de788c365d5db1495f0448f39e0fd79b9c3972..0488b41319d6e8281a86b1eaf2e1abb127047ee9 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2599,7 +2599,7 @@ If BODY finishes, `while-no-input' returns whatever value BODY produced."
        (catch ',catch-sym
         (let ((throw-on-input ',catch-sym))
           (or (input-pending-p)
-              ,@body))))))
+              (progn ,@body)))))))
 
 (defmacro condition-case-no-debug (var bodyform &rest handlers)
   "Like `condition-case' except that it does not catch anything when debugging.